From: Vijaya Kumar K Date: Wed, 4 Mar 2015 06:06:25 +0000 (+0530) Subject: xen/arm: Don't pass the PSCI-0.2 node to DOM0 X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3664 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bf8d458f5762cbb87a6965a90d36186d804ff50e;p=xen.git xen/arm: Don't pass the PSCI-0.2 node to DOM0 psci node is generated by xen for dom0. if the host device tree has psci-0.2 skip parsing this node and avoid copying from host device tree to dom0 device tree. Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index aaa3b97584..ab4ad65205 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1029,6 +1029,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("xen,multiboot-module"), DT_MATCH_COMPATIBLE("multiboot,module"), DT_MATCH_COMPATIBLE("arm,psci"), + DT_MATCH_COMPATIBLE("arm,psci-0.2"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), /* The memory mapped timer is not supported by Xen. */